merge trunk
authorKenichi Handa <handa@etlken>
Fri, 23 Apr 2010 02:17:09 +0000 (11:17 +0900)
committerKenichi Handa <handa@etlken>
Fri, 23 Apr 2010 02:17:09 +0000 (11:17 +0900)
commit59e809d1d220262dcadebbf84bc97cc418f99464
treebaad0d41c562d644517dd1e493978d51abd8c4d5
parent2bb1f0656fd19603b775408a688703ff525122df
parentd0278148c200049d2f59995c489b05c9a8d8b3bb
merge trunk